Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 8 Jul 2010 11:50:25 +0000 (11:50 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 8 Jul 2010 11:50:25 +0000 (11:50 +0000)

Trivial merge